Roberto González fix for BT#7413