#86 fixed