Bug fix for persistent drawings