Removed parallelfix from branch for compatibility with master branch