Temporary fix for use_nm = false setups