revert previous fix until I can find out why it was wrong