Add a workaround for upcoming fragment (need a better solution)