Removed hack in case it is causing my difficulties ...