Workaround for #742