Fix basic mode