Fix #94. BTW should we differentiate the preview mode?