Fixed Get*Option

@pzion as discussed