ugly hack not longer necessary