reordering and fix for %post