OPTIONAL implementations fixed

Fixed the creation of OPTIONAL result with no binding