Fixes #432