Possible fix for device bustage