Fix notices #12. Props @ArseniKavalchuk