Add workaround for #126