Addressed issue #1134