DB_Handler bugfix