bug fixing...or something