Using a better workaround, much smarter one