FIX: OS/MATLABver specific bug