Fix #524