as per #109, also relates to options
as per #109, also relates to options