fixed but with ugly hack