Fixed a ugly hack