#1267: Reenable markers and fix bug