Bug fix to allow for comments