Fixes #602.