FIX: live preview issue #125