temporary hack for http://code.google.com/p/android/issues/detail?id=23096 :/
need to find a better workaround