#87 fixed