A little backward-compatiblity ...