Got rid of Willy's bugs