Fixed that option primitive types dont returns None