preView fix for 201401+