fix helper methods