Fixed issue #13
Revert "Fixed issue #13"

This reverts commit 80e5168e5cc656130f092da9cc0a8de7797c208b.