fix #147

cc @yields @reinpk