Fixed code as well