Change to marker creation process.
Merge fix.