Nicholas says: small fix (and new testing case in the DB init script)