Fix ticket #13