current device wasn't correctly being assigned