Fix ticket #2