Fixed errors introduced by Arbiter