fix passing keys to _fill_message_args