Bug fix & testing