Post-final

Fixed marker listener bug