Fixing previous fix