fix mixed up methods