fix methods for parsing