bug fix with ? / false