Fix for when value can be null.