WIP; fixes case when asset_r is float