cruft fix