More robust commit to fix issues with CONVERT and Darwin