Revert "Fixed issue #25"

This reverts commit 47e7f291cc64332891f94640fa4ea30c6326eab9.