Fix for support of create devices