Fix basic preview to new as proposed by #2 #3