fixes #419
fixes #418
work #417