continuing fighting bug :(