Fixed markers to make sure they don't break over multiple lines. Closes
#144