Bug fix with SetupFragment