fixing more bugs
fixing more bugs