fixed helper methods