fix methods again