Fixed methods that was returning wrong value.