Fix for skittish puzzle request behaviour