(CE-3) Make use of message param instead of hack