Fixing code takes huge amount of time(