refactoring handling of 2.4