Resolved #16 by adding special case %peep