Minor improve