bug fix return null removed