Solves Bug#8490