Bug fix for the new EPFL Server by Amer Thanks