partial fix for ELC