fixes #550