Fixed incorrect definitions