added #728, #273, and #288