Refine workaround