Fixed the nasty workaround