Fixed EPR#401184 and 401188