#16 got devices working again