Make life easier and maybe fix a bug