fixes from Karin