Corrected broken backwards compatibility