Test 798

Fixed #48 & #49