Fixed naveed's mess