Fix for Preview Tool