one or two bugfix