Addressed issue #181 in a different spot