Added ugly hack