fixed eyre injection ordering