Fixes #550