At first glance I didn't see a clean way to preserve that check - but I'll take another look.