Another ugly hack