SEF partial fix