Simplified previous fix

Modification to e495e9063e854701ec8d95b1103414c8f09b46da