fixing the breaking behavior on device