CON-775 Fixed

CON-775 Fixed