Fixed issue for edison