The funny thing is that I could swear that I had already fixed this problem (which is maybe why I felt that it wouldn't have to be so complicated)...