I could need some help with this clause, currently it seems "wrong" after my change...