Cover more cases without hurting and increment version number