Fixed #20 and another regression