fixes from Jens