Changed order of library inclusion for #293