Test 811: Fixes #55