Fixed. Should work (still untested).