Fixed methods issues