resolved bugs