bug fix, add specs