Resolution to #229 and #230