Fix Issue #934

Fixes issue #934. Command is created for the selected database, not the default database.