Fixing the problems