Fixed "using unaddressable value"