Preview bug fix