#196 - fixed