Dhm/asset bug

@gwprice must be merged for the release