Add workaround for #5