#104 fix