Cleanup workaround