Bugfix 'Unexpected character'