fix workaround code.