Test and fix for #272

Test and fix for #272