Prepare ze workaround