bug fix on preview
bug fix on submit