Fixed for CI issues and lesser php version