Added a workaround to deal with a bug in database handling in release 0.16.