This seems like a nasty hack. Why do we need this ?