bug fix in devices