Fixes #436