Fixing issue #26 - some views disappear sporadically or physical devices