Fix for edison