Bug fix + PDO