Fix for markers