Fixed #80 and #70 (again)