added an ugly hack