Corrected UnsupportedOperationException as a result of using singleton maps.