We have a potential fix for this already in the pipeline, which might come to Singularity with the next patch.