Fix for viewable_on_device