Fixing not optional value