fixed extension order, hopefully correctly this time