fixes from Sunanda