Very Very Ugly hack TODO: revert this