temporary uggly bugfix...