This patch makes Tim happy