Fixed issue 6: Invalid device status