Fixing click off issue