[#715] Tweaks to  method