Try to preserve backward compability