Fix for TA-915