re-shuffle to make c90 compatible