xs device bugfix