reintroduce code deleted by porting MR!1504 (BASOP issue 1564). Fixes #2008 as float and BASOP are now in sync