Fix for the previous fix.