issues #114, 112, 110, 81