Bug fix for single devices not working