Fixed further bug