MVP-531 added -i option