Reproduce bug #111
Simple solution for #111