#140 - fixed