fixed some issues with empty BaseValues