Fixed issue brought up in #22