fix issue with devices