make compatible with master