Another attempt at fixing device bustage