#178 fixed Collections issue