Fixed methods logic