Specify indx for format
FIX more bugs / backport mistake