bug fix for Map used as iterator conversion + added related test case