this *should* fix https://github.com/rSmart/issues/issues/361 but be aware if *might* also create a behavioral change