two small changes to make future things easier