minor code adjustment from woo in #6.