fixes #436