Revert "Fix #17"

This reverts commit a287590897b7451ff39dd56aaaafe7feadf33a04.