From RDB: yet another fix in the ongoing quest to deal correctly