@dmitchell removed workaround. it works with your PR.