fixed #446
fixes #419
fixes #417