#240 & #246 : ok shod