Fixes more time issues on create