Fixed a bug with the comma operator