small fix and improve