Fix issue with an extra trailing comma