Fixed baaad baad code