Fix for SCATTER-260