bugfix use logic