Fix for previous fix