tickets #161, #163