11-07 Temporary solution ()