Improved temporary workaround