Hackish fix round 2