Fixed retarded mistakes