Fixes #434