follow-up to fc465c0