Fixes #442