further bug fixing of ee04491