Better handling some scenarios...