Fix for legon