fix for creating devices