commit #524