Fixing balance bug