bug fix, functional again