Fixed issue with later PHP versions