#38 litle fix