Workaround for #44