Allow sf2.3, fix scope issue