* Fix missing guard condition to deal with legacy data
