Temporary workaround for #587