Move workaround into the onCreate() method