Reversed previous fix