Fixed device collapse error