* Fix for a possible secuirty risk in preview functionality