Another little fix for crappy sources