Potential fix for remove markers issue