I like it this way actually, it's cleaner and faster. Just the warning should be enough. If anyone complained we can have the discussion later on.