#16 Correction of scope