fixed for running on hw