Fix ticket #20