better backwards compatibility