Hackish fix