Added check to see if supplied options already has a value.
5.4.2