Replaced workaround with fix