Fix #18; partially fix IA order placement