Ok, fixed message problem for real this time.