Bug 45543

https://bugs.php.net/bug.php?id=45543

Added handling for offset as well, besides ID.