Should fix both #75 and #76