Fixed issue with previous fix.