#80 partially fixed