Added checkbox hack