Fixed bugs with markers