Correct fix for issue #37