two labels added, fixed bug