Fix for using with NOMPI