#102 fixed