Temporary solution to CELDL-297