bug fix: same as last