fix fussy optimization