Fixed some issue with WYSIWYG