Fix for artefacts observed in Linux