fixed additional TimeMap issues