fix for [#71]