Fix for previous commit
ZW closes #2328.