Minor adaption.