less hackish fix