small fix and improvement