Merge BugFix

Fixed bug with barrierEngine.