fixing helper methods