Fixed handling of PEEK and PICK