Fixes #438