Fix non-compact mode