fixes #524