Added check for single device