Fix for issue SES-1