Fix #5
Preview Bug Fix