RichardH : fixed issue of trailing comma in method args