Bug fix for peek