fix small contexts processing