bug squashing!