Hmph, yet another bug caused by not having @since