Fixing the previous fix