restoring #524