Probable fix of #1 ticket