rollback change from issue #149