Fix for SLA-897