Workaround for #557