this fixes #436