Fixed problem caused by assumption about hash usage.