SEC-83 tweak to pass unit tests