Fixed: Applied fix to Jerome code provided by Andrei, thanks.