Add check for stretching