Fix ticket #18