Fixed hard coded bug