Hack around the problems