this was fixed can we remove the hack maybe?