bug fixing after testing