Fixing the Ring handler