Provide fix logic
for @Preview functions
#1728
Merged
fix logic
for @Preview functions
#1728