added fallback for values