Partial fix for nested conditional evaluation