Add workaround Ref #52