issue #27 fixes