Fixed #524