Fix for SLA-897

/to @chandadharap 
/to @sam-github