Re-added marker fix