Solves bug introduced 2 weeks ago