Issue #184 - last fix was broken!