Improved previous fix.