Fixing the problem