Fixed #524.