Yet another bugfix (related to markers)