Fix get on Option to get on Map