Remoor--Affialte problem fixed