Fixed issue with where pipes were lagging