Added checkbox hack!