defer bugfix