Resolution to #229, #230, and #243