more Bugs by Miguel