fixed issues in preview