Still fixing detect