Fix ticket #24