Revert "Fixed ticket #19"

This reverts commit cb5f93693dc15d4e2e4a92ec0c3cb420cb23a893.