Preview bug

Fixing two bugs that occurred on the new Preview funcionality