- removed bugs with maps implementation