Fix for get instead of pop