Fixing Chuck Norris support