fixes #436
fixes #466