It's simpler, but it's not the fix asked. :P