PDO System fix