bugfix for 2.3 devices