Massaging out bugs (#7)