fix #221 - further