Fixing part of the preview creation
Rev version