Very ugly and temporary fix