Fixed bugs with Ben