Fix for issue #123
Revert "Fix for issue #123"

This reverts commit 7b3d3d567b084940de3671ca103f7b183f034a3e.
Revert "Revert "Fix for issue #123""

This reverts commit d8b24f2bfcfe4d82b11bc27c0d306097301e55c5.