Workaround for #545