Fixed a critical bug (LAST CHANGE FOR MODJAM)