Fix ticket #41