Fixed ticket b05bb6c4