fixed an issue with message source and model as params