#104 fixed