Revert "Fix for issue #2"

This reverts commit f23fabf69322c5fe227a1a423af0ff2208506d76.