simplified
bug fix