Issue associated with #39
Issue associated with #39