partial fix of preview